Fix a problem with marks on vertical scales
authorMatthias Clasen <mclasen@redhat.com>
Wed, 5 May 2010 00:33:21 +0000 (20:33 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 5 May 2010 00:33:21 +0000 (20:33 -0400)
gtk/gtkscale.c

index 9e92d9cbd376b14f241c0d4a63c41d2cbe1dc74b..6b7da98469ab3cb0c44d42ca05e0420163f24123 100644 (file)
@@ -946,7 +946,10 @@ find_next_pos (GtkWidget      *widget,
         return marks[i];
     }
 
-  return widget->allocation.width;
+  if (pos == GTK_POS_TOP || pos == GTK_POS_BOTTOM)
+    return widget->allocation.width;
+  else
+    return widget->allocation.height;
 }
 
 static gboolean
@@ -1074,7 +1077,7 @@ gtk_scale_expose (GtkWidget      *widget,
                 {
                   pango_layout_set_markup (layout, mark->markup, -1);
                   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-              
+
                   y3 = y1 - logical_rect.height / 2;
                   if (y3 < min_pos)
                     y3 = min_pos;